(display-warning): In batch mode,

exclude the final newline from the arg to `message'.

diff --git a/lisp/warnings.el b/lisp/warnings.el
index 07075fa970cf6ef9bc198034f5faf198438a3395..99f345baa55dc6e5008aa4500d736c52765ace32 100644 (file)
--- a/lisp/warnings.el
+++ b/lisp/warnings.el
@@ -257,7 +257,13 @@ See also `warning-series', `warning-prefix-function' and
            ;; Do this unconditionally, since there is no way
            ;; to view logged messages unless we output them.
            (with-current-buffer buffer
-             (message "%s" (buffer-substring start end)))
+             (save-excursion
+               ;; Don't include the final newline in the arg
+               ;; to `message', because it adds a newline.
+               (goto-char end)
+               (if (bolp)
+                   (forward-char -1))
+               (message "%s" (buffer-substring start (point)))))
          ;; Interactively, decide whether the warning merits
          ;; immediate display.
          (or (< (warning-numeric-level level)